[RFC] rimage: Add support for multiple toml file #179
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
September 13, 2023 16:20
We are either signing or verifying an image, not both or neither. Signed-off-by: Chao Song <chao.song@linux.intel.com>
This patch adds support for multiple toml configuration file. In this patch, the multiple input toml files will be merged into a single toml file, and the merged file will be stored in the same folder of the firmware to be signing or verifying. Signed-off-by: Chao Song <chao.song@linux.intel.com>
btian1
reviewed
Sep 14, 2023
| /* make sure we have an outfile if not verifying */ | ||
| if ((!image.out_file && !image.verify_file)) { | ||
| /* We are either signing or verifying an image, not both or neither */ | ||
| if (!(!!image.out_file ^ !!image.verify_file)) { |
There was a problem hiding this comment.
possible to figure out a more easier expression for better understanding?
There was a problem hiding this comment.
" not both or neither " would this not imply to fail if !out_file == !verify_file ? Pls check my logic here though.
| fclose(out_file); | ||
| return NULL; | ||
| } | ||
| copy_file(file, out_file); |
There was a problem hiding this comment.
use file pointer as parameter is not always proposed, directly read and write is also very simple.
btw, how about fread/fwrite? since toml file is not big.
lgirdwood
reviewed
Sep 14, 2023
There was a problem hiding this comment.
@aiChaoSONG btw, this can be better done with the GNU pre-processor (like we already pre-process linker scripts).
i.e. mtl-sku.toml
// all platform memoery addresses
#include <platform.toml>
// all Intel signing config
#include <intel.toml>
// all modules
#include <volume.toml>
#include <copier.toml>
and so on
|
replacement: thesofproject/sof#8243 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
add support for multiple toml file for rimage, prepare for split toml file
to platform related toml and algorithm related toml.
The previous RFC #176 won't work for windows system, because it uses a linux specific function,
This RFC should work both for windows and linux.